From a84ac8e3d80175e1b343630c51f7d32624b49c2e Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@imendio.com>
Date: Fri, 14 Dec 2007 11:20:10 +0000
Subject: [PATCH] gdk/gdkinternals.h #include <gio/gio.h> instead of individual
 files.

2007-12-14  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkinternals.h
	* gdk/gdkapplaunchcontext.h: #include <gio/gio.h> instead of
	individual files.

	* gdk/gdkapplaunchcontext.c
	* gdk/x11/gdkapplaunchcontext-x11.c: remove all gio includes, the
	header already includes everything now.


svn path=/trunk/; revision=19180
---
 ChangeLog                         | 10 ++++++++++
 gdk/gdkapplaunchcontext.c         |  2 --
 gdk/gdkapplaunchcontext.h         |  2 +-
 gdk/gdkinternals.h                |  2 +-
 gdk/x11/gdkapplaunchcontext-x11.c |  2 --
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da4111eb31..dfca93aed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-14  Michael Natterer  <mitch@imendio.com>
+
+	* gdk/gdkinternals.h
+	* gdk/gdkapplaunchcontext.h: #include <gio/gio.h> instead of
+	individual files.
+
+	* gdk/gdkapplaunchcontext.c
+	* gdk/x11/gdkapplaunchcontext-x11.c: remove all gio includes, the
+	header already includes everything now.
+
 2007-12-14  Mathias Hasselmann  <mathias@openismus.com>
 
 	Correct "Since:" tags for GtkPageSetup and GtkPrintSettings as
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 06955ddb13..006092f38b 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -26,8 +26,6 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <gio/gfileicon.h>
-#include <gio/gthemedicon.h>
 
 #include "gdkapplaunchcontext.h"
 #include "gdkinternals.h"
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 70b814cfbf..806125b630 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -24,7 +24,7 @@
 #define __GDK_APP_LAUNCH_CONTEXT_H__
 
 #include <glib.h>
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 #include <gdk/gdkdisplay.h>
 
 G_BEGIN_DECLS
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 8c79cb1021..aa56b795a5 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -26,10 +26,10 @@
 
 /* Uninstalled header defining types and functions internal to GDK */
 
+#include <gio/gio.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkprivate.h>
-#include <gio/gappinfo.h>
 
 #ifndef __GDK_INTERNALS_H__
 #define __GDK_INTERNALS_H__
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index 17d3340de6..6f810c9f92 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -26,8 +26,6 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <gio/gfileicon.h>
-#include <gio/gthemedicon.h>
 
 #include "gdkx.h"
 #include "gdkapplaunchcontext.h"
-- 
2.30.2